From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 31 Jan 2011 06:47:55 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~4685^2~82
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=0adef1f2012ef918168b56593e35fca3854d8645;p=emacs.git

Merge from mainline.
---

0adef1f2012ef918168b56593e35fca3854d8645